bitkeeper revision 1.1159.183.24 (41a99292Q4Rvb0BcaO7VuY-rhuCz6w)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 28 Nov 2004 08:55:46 +0000 (08:55 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 28 Nov 2004 08:55:46 +0000 (08:55 +0000)
commitd7ead0994ead6f849613a75f9a57558bf9b15cc9
treedb89d299aca7cda2e2c6589c73eedcc53eff34f8
parentefb2f475fe1ca323fe834b51bf4cd262f5853954
parente97d12ad95b22d60cdf4db35f3cd524c3170f9ca
bitkeeper revision 1.1159.183.24 (41a99292Q4Rvb0BcaO7VuY-rhuCz6w)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk